Major performance improvement - 50 times faster than before