Ce's work on 7/22, see notes for details