36 Update partial solution to cover more case