changes to reflect new constraints