Added expiration of dates and color coded time periods