#31 reused addAddress function