resolved scope issues