small controller changes
controller merge