4.7 optimizations