some scope rearrangements