Feature/club 716