ported section 2.6