adding latest changes for security