Router.load removed and yield surface