consolidated some of the constraint calls