+ Makeup and optimizations