Character optimizations part 2