Some optimizations...