Incorporated my dad's comments