#14: Added update and remove sets and changed the update flow.