Cleaned up section 2.2