More work on new scoping approach, try-it should work now