changes to controller and object creator