[cyril] try to optimize cells performance.