partial addition of date picker
merged with Caroline