Decorator added to override output
CSOR edits