added group into all function