Add error check
New complete file feature