Current Context handling improved ... I think