Incremental Update - Fixed bugs