Merged with Axiom changes