A lot of changes in js