supplementary section 6.7 and 6.8 cleaned