Modified some constraints