change clone strategy // TODO Better