removed the singleton
added badges