dates now work
merge