Controller changes added