Feature/club 965