Draft, typescript and carbon, corrected