not needed
Added raw data. Simpler code