better validation ...