upgrades to support the new seperate addresses