little more code - some for Context handling
little more code - some for Context handling