moving machine2 stuff into conf