Final transition edits