Updated for 2014; java version working, javascript not