updated validation; not yet done