Finally fixed the tree shit