copy tweaks
merging conflicts