Refactored combo, created form.Date