some update

better express
add origin data to output