switch to new pagoda pattern aug'13