runs as js now, some renaming