adds changes for 2.0.16