updated to work with new axiom core