hamiltonc
committed
on 12 Jul 06
reorder the placement of fields so that they make more sense