Changed cell update scheme to add flexibility