Update to match main JS