Some JS changes