Take 3 at groupid defn change


This replaces the failed pull requests 2 and 3