Validate improve

Left as a reference.