Upgraded JS mode