re-added multiple group bys