wIP new suffix structure