added adding/removing/resetting functionality