Some changes to sections 2 and 3