updated for more cells