Data preservation & major overwrite fix