Feature/club 664 feedback