Incremental Update - Fixed Bugs