Feature/club 677