Feature/club 632