changes to constraints and so on