added add/remove functionality