milestone 1 - patches 4
- Correcting peer choosing mechanism