36 + Minor Optimizations