changed new2.js
merge