Rework after copy/paste