modify to adopt HTML Validation