Small updates
Switch to non-normalized for stage 1.  A little slower.