singleton? fixed
correct except encore q's