includes using some stuff that was supposed to be for rin

456