changes for v1.6