Fixed reporting; working on initial notification