merged from john-ellison.com