some changes in js