Added Jeff Way's generator