Addressing scope issues.