Index: trunk/Ohana/src/opihi/cmd.data/vgrid.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/vgrid.c	(revision 7917)
+++ trunk/Ohana/src/opihi/cmd.data/vgrid.c	(revision 9275)
@@ -34,22 +34,8 @@
   Ny = (Ymax - Ymin) / dY + 1;
   
-  /* these steps are a standard 'createbuffer', define? */
-  bf[0].bitpix = -32;
-  bf[0].unsign = FALSE;
-  bf[0].bscale = 1.0;
-  bf[0].bzero  = 0.0;
+  gfits_free_matrix (&bf[0].matrix);
+  gfits_free_header (&bf[0].header);
+  CreateBuffer (bf, Nx, Ny, -32, 0.0, 1.0);
   strcpy (bf[0].file, "(empty)");
-
-  bf[0].header.bitpix = bf[0].bitpix;
-  bf[0].header.bscale = bf[0].bscale;
-  bf[0].header.bzero  = bf[0].bzero; 
-  bf[0].header.unsign = bf[0].unsign;
-  bf[0].header.Naxes = 2;
-  bf[0].header.Naxis[0] = Nx;
-  bf[0].header.Naxis[1] = Ny;
-  free (bf[0].header.buffer);  /* ALLOCATEd in SelectBuffer */
-  free (bf[0].matrix.buffer);  /* ALLOCATEd in SelectBuffer */
-  gfits_create_header (&bf[0].header);
-  gfits_create_matrix (&bf[0].header, &bf[0].matrix);
 
   ALLOCATE (val, float, Nx*Ny);