trying to remove ooms
added new jni stuff