client server included, trying to change some things in protocol