Added 2P mode