Upgraded version to v12