Many changes in Section 5.2