working on snapshots v2