Some copy paste changes