Updated: gms and v7 v4