Draft, typescript carbon, corrected