first commit
enhance data parse