More 24x24 optimizations. Getting there slowly.