Sect. 5 & 6 Edit