Use the proper callback and number the snapshots consistently