Reorganised controller
Reorganised controller