added columns in raw and ordering