rewrote sections 5 and 7