Updated after controller and model discussion