updated addressable behaviour