Pre-edit rebuild