little more code - some for Context handling