Removed ugly running state reporting mechaninsm