slight edits to controler