Changed States to Singleton States