Tweak the last round of revisions to Router and Controller