Use my new tree file instead of mixing math and drawing