Added some cell updating logic