more changes for snapshots