streamlined description and used diff -uprN to generate