.
more scope tweaks
.