Adding updates developed while working on the 15-minute chat