Returned to (altered) older correct version without decorators