Update to use Javascript