updated and corrected changes for v1.2