more optimizations.. it's getting better