starting to get rid of null dates