updated with latest group internal code