Please feel free to suggest anything...

* fix all the race conditions :-)