Add special handling for bolshoi