making date and day of week as required field,adding company in group by