Updated Sample and Module Code