added endDate field, TODO: implement in front end