Updated machine detection
Updated machine detection 2