final removal of atomics
rearanged routes for adding