#516 Copy updates