Updated for workshop December 2019