improved copy/paste