changed to diff tree library. Small bug fixing...