starting on 07 to address reviews
provisionally addressed feedback from Brian Carpenter