working on 2017 updates