FIX groups, add localization