Step 5 - Keep track