Improved with larger cells

Change-Id: If583e9595e1d3bd627d0e4795b8e1cc227cbbacc