Re-arranged machine list