Now have validation to ensure all fields are selected