SmartStrategy added for CPU among other things
Merge conflicts