Fixes
Revert Controller