changes for v1.8