completes 6.0.0 without tree; #102; #103