issue #3 - changed property storrage