new constraints model

36 files changed