Update Address
Got Address related parts to include most up to date functions