change name for js
merge code
update