Context made 'non-singleton'  -not tested