More work on the constraint list