Move stuff to changesManager