Change constraints to use new logic