Prepare New generation
Fix reference
Fix reference
Improve PreParse step