reimplemented some of what's been lost in crash