working on persistent storage