Feature/club 987