Router modified