Little reworked routing, according to our requirements