added custom cell and more logic.