changes for security issues