Add more machines, fix for unresponsive machines