Simplify controller
Find correct controller