L7 II: Combine with the new changes