Rough edges are gone
add support for SNAPSHOT_ON_ERROR