Switching to new branch to fix scoping