Updated for vulnerabilities