Updated address, added isolated scope