more and more controller changes