Updated router