Correcting Mistakes from previous big commit