Moved more code to different controllers