Feature/club 850 feedback