Updated to match main JS file