Changed around the controllers