revision according to onsite data
fix the recursive bug
revise accordingly to the onsite data