Moved logic to storyboard