More work on constraints