Updates from 2016-2017