adding eric's track merging updates