Almost done with constraints