implemented contains sensitive and sanitized data
merge fixes