Added Packethandling to improve client/server consistency