- fixing up the adding and removing of endpoints