final changes for v1.0