Rearrange base case