Added better controllers