[37] Made some major changes to how the Router class works