added some new constrains