Trying to make moving to new machines less painful