More on the modeling
Fixed constaints