Added notes 16 and 17.