More optimizations

More optimizations