updated for clean machine