replaced group order dict with a list to easily manage