Feature/club 492