Added re-reads on make-upsert.
tweak to last commit