Finished update, got rid of bogus in setvar