Trimmed code
updated protocol short flag