~10% performance improvement, hope i did not break anything