Switched back to single controller