Edited these things so they could take raw data