switching to Singleton class