Added proper routing between editing coordinates and such