Improved multi-core implementation