Update for scoping