More controller changes.