changes to getSingletons