Made safer for crashes