some changes to scope