change to use right external addresses