Improved update procedure with correct order of updates