Feature/club 618b