WIP improved leaf distribution