Tweaked the PacketHandler a bit