Modified for html validations