Some Changes to Copy

Signed-off-by: Dan Riddell <dan@twenty4.com.au>