Added few changes, allowing multiple clients contacting server