added support for new filenames