Made some changes as I reinstall on my desktop