Add scoping for part B 2