Added some constraints, model updated