Updated Controller and Model