Finally! ;) Finished merging code =) multiple clients work