changes for Sonny's comments