[step-2] Updated routing bugs