merge code
improve some activity
merge code