Validate improve

debug code?