moving general vars to data