Fixes for Emergency Case, now handled correctly