added improved border router code