try to speed up even further