Refactored to pass variable
Testing add/remove