updated Address reference
merged conflict