Feature/club 581

Not sure but removed in a new PR :-)