new constraints, modified behaviour