Re-worked core architecture