class fix, singletons added