Upgraded CJS version