updated the different cases