Tightened up the constraints.