move tool changes that got lost when branching ??