Iteration 3 Changes

Made Changes To Codes To Incorporate Changes Into Iter 3