More changes for js