Feature/club 680