switch to new pagoda pattern