Improved some routing