Minor controller change 2