LYUYOU
merge conflict with func 2,3 solved