merged copy changes from Chris