updated controller to reflect mockup changes