Changes concerning taking snapshots