updated emergency solution