Performance updated, changed if else to switch case