refactor to use new integration

/cc @calvinfo