changing over to machine-groups nearly complete