Shapiro new composite revised May 30, 2017