code changes for version 12