Changed EOD and the confirm button logic changes