Added back in case 4 and dates enter correctly