Added notification instead of polling
Now in a working state again