Updating switch case with correct itnent values