Reorganise to be able to work for both the initial and subsequent machines.