Updating data structures (commit 3)