added crash management