Shield upgrade system also working