Added the ordering constraints, they seem to work fine