refactor to ximbee