Much better validation.