Updated packet design and server/client code