rework of cell class. Add indicator