fixed controller and rira did some stuff