rich update
fixing bug around constraints