Added another speedup