changed some shit in the controller