Improved the router