changes for singletons