Made all controllers work