Added logic for showing dates
Added logic for showing dates