add/remove work in theory