Changes

If database query successful THEN update sockets
Merge branch 'Dev'