bug correction + routing