added missing files from peters patch