- added rw locks to handle disconnect / reconnects