More optimizations if needed