Made some controller changes