Updated for quad-core support