MainPeer.java merged