last edit based upon Dan's feedback