added conversion of dates to company as well