made some changes to controller / owner