update
rename func
more code comments