Feature/club 245