Modification to handle actual filename