Speed up gen a bit (~.66 sec improvement)