switch Singleton to Statless