Area optimization on my previous solution. Hopefully improved with the secondary metric.