Step 5, add/remove refactor