Update for Vanilla vs Extended