2016 and 2017 updates