Add more robust group closing system