singletons to fix
singletons to fix