fixed the constraints
merged