Some changes in js