Correcting algo cases (switch 2 and 3)