catch up to XS and FFI