Made some sever and client changes