Polished the client and server sides