made indexes into trees

Change-Id: Iadab9a140821b68ac502ce9d67133972aa86966a