Changed how scoping works.