Pre-ed_info simplification
Commit
Commit