Singleton added and working