Reimplement times and make ordered leaf list