refactor raw data
debug