modified to support file names that contain _e and _f