working add/remove