Fixed Constraints
removed redunduncies