big push with js changes