Rearranging methods on Controller and adding if check before switch