remember to add date fields