updated SGen class, still debugging
fix conflicts
rename files