Commiting Fixed Issues caused by Sam