changing singleton- adding context, for ex.