moved the common controller to the top.