corrected all the constraints