This my enhanced version, laid out in the same fashion as the first one.