I didn't do any testing on it, but I think it is faster.

It's quite easy to fit in , I'll try and post the code later this week.