context changed to singleton