Added Switch Logic for readability