Updated controller stuff