Rework controllers