updated regex on constraints