+ simplified significantly the makeTree logic