Also to set doc-text & removed debug logging