oops
fix more grouping stuff