base data edit ....commit by 20141221