Changes for JS version and working with Randori Compiler