Incremental update

Added more soft constraint checking