After lots of little changes to different controllers