Finally got rid of makegroups