3/tree problems

I'm no fan of column shifting, for this exact reason. Even after you rebuild it, one can never be quite sure about the next shift. It's a royal PITA in the rain, or after dark.
So I vote for a floor-shift conversion.