Feature/club 966 2