Completed a first version with full longitudinal matching to RF bucket.