proper multi-machine support