Made changes to peer assignment