Updated P2P to match Don's display and clear functions