Updated the P2P part to have a waiting time