swedish adjustments, boost refactor +groups