Further improvements to controllers