better end date support