Some optimizations again