Latest commit increased perfs a lot