Works with events now but still needs activation at startup