Corrected Geefe, added 2 generators modifications