pb's copy changes
merged in master