Final draft with filename functionality