Updated to not bork > Windows 7