lots of changes in sections 1 and 2