minor improvement

still need to transfer stuff from the controller to the model