This significantly improves performance.
Not perfect yet though.

Signed-off-by: Peter Atashian <retep998@gmail.com>