Optimize expansion a little more.