Small perforamnce speedup