Reworked routing