a little restructuring and implementing the wh vuln request