Feature/club 850 feedback round2