improvements to support cut/paste