Fully edited, awaiting TCs