Faster and With More Feeling!

Optimization patch for single core computers.