H3 branch for use by Steven Hayes