diff --git a/ftn_init.F90 b/ftn_init.F90
index fba5656a2..14f4d5910 100644
--- a/ftn_init.F90
+++ b/ftn_init.F90
@@ -18,7 +18,7 @@
 !   25  meas25.dat
 !   26  tmp26.tmp
 !   27  dphi.txt
-
+!   28  saved *.tf2 files
 !------------------------------------------------ ftn_init
 subroutine ftn_init
 
diff --git a/map65.py b/map65.py
index 35bd93251..1d97fef54 100644
--- a/map65.py
+++ b/map65.py
@@ -1,4 +1,4 @@
-#---------------------------------------------------------------------- MAP65
+#--------------------------------------------------------------------- MAP65
 # $Date$ $Revision$
 #
 from Tkinter import *
@@ -1342,8 +1342,7 @@ savemenu = Menu(savebutton, tearoff=1)
 savebutton['menu'] = savemenu
 nsave=IntVar()
 savemenu.add_radiobutton(label = 'None', variable=nsave,value=0)
-savemenu.add_radiobutton(label = 'Save timf2', variable=nsave,value=1,
-            state=DISABLED)
+savemenu.add_radiobutton(label = 'Save all', variable=nsave,value=1)
 nsave.set(0)
 
 #------------------------------------------------------ Band menu
diff --git a/map65a.F90 b/map65a.F90
index 888f60f88..b5d61ae66 100644
--- a/map65a.F90
+++ b/map65a.F90
@@ -334,8 +334,9 @@ subroutine map65a(newdat)
   call display(nkeep)
   ndecdone=2
 
-  if(nsave.gt.0) call savetf2(id(1,1,kbuf),nsave,nutc)
-    
+  if(nsave.gt.0 .and. ndiskdat.eq.0) call savetf2(id(1,1,kbuf),nsave,   &
+       ntime,nutc,savedir)
+
 999 close(23)
   ndphi=0
   if(kbuf.eq.1) kkdone=60*96000
diff --git a/savetf2.F90 b/savetf2.F90
index 4207d466b..1bf261b74 100644
--- a/savetf2.F90
+++ b/savetf2.F90
@@ -1,50 +1,100 @@
-subroutine savetf2(id,nsave,nutc)
+subroutine savetf2(id,nsave,ntime,nutc,savedir)
+
+#ifdef Win32
+  use dfport
+#else
+  external gmtime_r
+#endif
+
   parameter (NZ=60*96000)
   parameter (NSPP=174)
   parameter (NPKTS=NZ/NSPP)
   integer*2 id(4,NZ)
   real*4 ss(NPKTS),ss2(60)
   real*8 dt,t,t2
+  character*80 savedir,fname
+  integer it(9)
 
-  dt=NSPP/96000.d0
-  t=0.d0
-  nh=nutc/100
-  nm=mod(nutc,100)
-  t2=3600*nh + 60*nm
-  fac=1.0/(4.0*NSPP)
+  if(nsave.eq.1) then
+     print*,nsave,nutc
+     print*,savedir
 
-  do i=1,NPKTS
-     s=0.
-     do n=1,NSPP
-        s=s + float(int(id(1,i)))**2 + float(int(id(2,i)))**2 +     &
-	     float(int(id(3,i)))**2 + float(int(id(4,i)))**2 
+     n2=ntime/60
+     n3=(n2-1)*60
+
+#ifdef Win32
+     call gmtime(n3,it)
+#else
+     call gmtime_r(n3,it)
+#endif
+     it(5)=it(5)+1
+     it(6)=mod(it(6),100)
+     nhr=nutc/100
+     nmin=mod(nutc,100)
+     write(fname,1000) it(6),it(5),it(4),nhr,nmin
+1000 format('/',3i2.2,'_',2i2.2,'.tf2')
+     do i=80,1,-1
+        if(savedir(i:i).ne.' ') go to 1
      enddo
-     ss(i)=fac*s
-     t=t+dt
-     t2=t2+dt
-     if(nsave.eq.3) write(24,1010) t,t2,ss(i)
-1010 format(f9.6,f15.6,f10.3)
-  enddo
 
-  if(nsave.eq.2) then
-     dt2=551*dt
+1    iz=i
+     fname=savedir(1:iz)//fname
+#ifdef Win32
+     open(17,file=fname,status='unknown',form='binary',err=998)
+     write(17) id
+     close(17)
+#else
+     open(17,file=fname,status='unknown',form='unformatted',      &
+          access='direct',recl=nbytes,err=998)
+     write(17,rec=1) id
+     close(17)     
+#endif
+
+
+  else
+     dt=NSPP/96000.d0
      t=0.d0
+     nh=nutc/100
+     nm=mod(nutc,100)
      t2=3600*nh + 60*nm
-     k=0
-     do i=1,60
+     fac=1.0/(4.0*NSPP)
+     do i=1,NPKTS
         s=0.
-        ns=0
-        do n=1,551
-           k=k+1
-           s=s + ss(k)
-           if(ss(k).gt.0.0) ns=ns+1
+        do n=1,NSPP
+           s=s + float(int(id(1,i)))**2 + float(int(id(2,i)))**2 +     &
+                float(int(id(3,i)))**2 + float(int(id(4,i)))**2 
         enddo
-        ss2(i)=s/ns
+        ss(i)=fac*s
         t=t+dt
-        t2=t2+dt2
-        write(25,1010) t,t2,ss2(i)
+        t2=t2+dt
+        if(nsave.eq.3) write(24,1010) t,t2,ss(i)
+1010    format(f9.6,f15.6,f10.3)
      enddo
-  endif
 
-  return
+     if(nsave.eq.2) then
+        dt2=551*dt
+        t=0.d0
+        t2=3600*nh + 60*nm
+        k=0
+        do i=1,60
+           s=0.
+           ns=0
+           do n=1,551
+              k=k+1
+              s=s + ss(k)
+              if(ss(k).gt.0.0) ns=ns+1
+           enddo
+           ss2(i)=s/ns
+           t=t+dt
+           t2=t2+dt2
+           write(25,1010) t,t2,ss2(i)
+        enddo
+     endif
+  endif
+  go to 999
+
+998 print*,'Cannot open file:'
+  print*,fname
+
+999 return
 end subroutine savetf2