Made some slight changed to these files