Tracking changes from original AceTree code