Simplified the packet system