More address changes

updated addressing to return values