Started implementation of section 3.7