Improved routing and stuff