Fixing Peer. Refactoring Tracker