[orangleliu] some modified