Slightly improving perfs