Feature/club 246