completed function user
merge ok
bo gemlock
merger 2 branch
continues folder and check coder.