Updated to match wikipedia script changes