updated forms validation