Optimize for 2D