updated to use addressable