updated to new Singleton system