added multiple machine support