Updated Code to a More Recent Version

Updated the code to a more recent version, which relies less on
Microsoft