Main Optimizations

Added main optimizations to merge into your build