Changed based upon new changes by professor