Optimizesd the composition a little bit