averez-114-snapshots: changes with jeff's feedback