fix scope everywhere so it works