Validated, errors fixed