Completley re-wrote file