Updated for newest router