Add 3 more groups
Fix double comitate