Added: code in client to handle all of iteration 2