Updated route C/D with changes from Andrew L.