Incremental update

Added 2 more soft constraint checks