Updated with Peer Assignment (2) code