Modified dynamic constraints, not finished