Updated for date picker