Feature/club 1222