Restored JS changes