Updated draffft for form vaildation