Draft, typescript, corrected


16748050