Corrected for structure in calc-next-gen - final generation creation was getting shortened.