final changes for v1.1