modifications to work with refactored macgyver
integrate crash