Corrected Router