scope issues resolved