Updated controllers a bit