Simplify incremental update and make it really incremental