Found another 10% performance improvement (70% faster in total)