Updated Controller and rest