Updated to reflect Microsoft updates