more work on scan store