new versions that fix Routing bug