more copy changes, removed repetition