minor changes
One Controller to rule them all