#21 reworked resetting of store (for larger projects)