Replaced some code that depends on copying