Updated Sample and addressed #3.