Modified router again