Structure redesign + range features partial