changed file names, removed tm