Work on FFI
Fix FFI