added add / remove functions