added context logging