Merging code with server

Server merge