change as Eric's comments