added jni back in