Bug fixed, now we need to make trees