Improved Router