updated add-remove use case