changed some of the singleton started implementing in code