Performance improvement on top of previous commit