Feature/club 670