Updated Java and JS files