Created new branch assignment2 and cherry pick from assignemnt 2

cherry-pick 5989c4959118837190db8a0195c9bcfff1b2a636