hopefully work with existing machines too
Add missing import
Fix typo
Use proper output
Use proper timeout option