Revised controllers
Merge