Hopefully this should increase performance a bit

This method is a bottleneck :(