restructuring of S 3.1 based on Chris' material