Error Correction
add Switch
streamlining the codebase.