add and remove working