Closer to working
Use new binary-safe versions of functions