re-added some raw data to keep it handy for now