Started to implement section 3.4