More controller updates