Added more constrians