updates to comply with new version of JOI