Added step 4 in switch case