Refactored switch
Merge branch 'new_store'