reworked routing
fixed routing