implemented changes from original library source, freshly compiled native libs