add security back in for rawdata here