wip
fix constraints
fix constraints