Added back in emergency state; cleaned up