added controller changes