Updates

as @ 23 July 2019