Combined changes to Sec 1,2 and to Sec 3