Added ordering and few constraints