Improved Figure 2

Just bringing my fork up-to-date with Finlay's additions