reorder some things
merge with origin