removed dependencies on filenames