Incorporate feedback from my wife!