FIX: Make backward compatible by returning both perc and fig