Updates. By Jeff Kreeftmeijer

f319d28d9f4b3f6cd427aae973c7b6caa1d4886b is the first bad commit