copy changes per mike's suggestions