controller rework