Added constraints - updated