Controller changes