Draft, typescript, corrected


16711862