reworked store propagation