some update of 900life
merge