Added output of filename, and removed hardcoded directory stuff