updated for compatibility with axiom changes