Clone performance slightly improved