Packet (not working!) and smaller changes