Add another lock around the single upgrade