Added Jeff's generator