A bit more about tooling changes, adding some sub-headings