updated to use ShadowStore