2D Optimization

Change-Id: Ia54cd14aff67612916e2c8ded733040179015996