updates to make all dates and times dynamic