Units bit more speedup