First commit after controller rework