updated for date import issue