old code removed; fix filenames problem