Added option to skip copy