updated add and remove functions