refactored axiom, bug fix