Snapshot improvement