adding file exist checks and commenting things out