new optimizations...