Tightening up controls