upgrading to PE 3.1; first pass