updated constraints
merge conflict fixed i hope