Added plot file and better matching