Improvements to copying system.