Added conditional date input - still needs to be approved/tested