Added Vi's changes for multipeer