More work on Leaf2