some controller changes