Fixed up controllers