That's quite perfect, only missing thing is higher checking frequency.
What about introducing checking frequency up to 5s or at least 30s?

Thanks Pete!