Changing to use clone context.